Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 7 Jan 2010 23:49:52 +0000 (23:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 7 Jan 2010 23:49:52 +0000 (23:49 +0000)

Trivial merge